From 9a5a71c5a3f89a079d04a9926c7e6d9c5de688a5 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 20 Jan 2013 16:02:08 -0600 Subject: [PATCH] Migrate to debhelper 9. --- debian/compat | 2 +- debian/control | 2 +- debian/control.in | 2 +- debian/rules | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011eb73..ec635144f60 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 7f42ec0bea3..1a5bca07287 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev, libgpm-dev [linux-any], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), - debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev, + debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev, libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Homepage: http://www.gnu.org/software/emacs/ diff --git a/debian/control.in b/debian/control.in index 838ceabf1b3..43e8e78b6bc 100644 --- a/debian/control.in +++ b/debian/control.in @@ -7,7 +7,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev, libgpm-dev [linux-any], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), - debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev, + debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev, libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Homepage: http://www.gnu.org/software/emacs/ diff --git a/debian/rules b/debian/rules index 644055fe514..d6bc1f10ac9 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ # Copyright 1994,1995 Ian Jackson # Copyright 2004-2005 Jérôme Marant -# Copyright 1998-2012 Rob Browning +# Copyright 1998-2013 Rob Browning # Originally copied from the GNU Hello Debian rules file (1.3). # Modified for emacs by Mark Eichin . @@ -100,10 +100,10 @@ endif deb_host_multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -CFLAGS = `dpkg-buildflags --get CFLAGS` +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall -LDFLAGS = `dpkg-buildflags --get LDFLAGS` -CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` +LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) +CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter $(DEB_HOST_ARCH),ia64)) -- 2.30.2